From 4ed47e757fd0c5abf04a4f8341f0796f6afd696f Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Thu, 5 Nov 2015 09:41:10 -0500 Subject: [PATCH] Fix a crash with steppers The introduction of the trough node was not properly carried into the code constructing stepper nodes, and was causing assertion failures there. This was only showing up on Windows, since Adwaita and HighContrast don't have steppers. --- gtk/gtkrange.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gtk/gtkrange.c b/gtk/gtkrange.c index cae85924b1..dd26dcf777 100644 --- a/gtk/gtkrange.c +++ b/gtk/gtkrange.c @@ -4264,7 +4264,7 @@ _gtk_range_set_steppers (GtkRange *range, { priv->stepper_a_node = create_stepper_node (range, "down", - priv->has_stepper_b ? priv->stepper_b_node : priv->slider_node, + priv->has_stepper_b ? priv->stepper_b_node : priv->trough_node, NULL); } else @@ -4281,7 +4281,7 @@ _gtk_range_set_steppers (GtkRange *range, { priv->stepper_b_node = create_stepper_node (range, "up", - priv->slider_node, + priv->trough_node, NULL); } else @@ -4299,7 +4299,7 @@ _gtk_range_set_steppers (GtkRange *range, priv->stepper_c_node = create_stepper_node (range, "down", NULL, - priv->slider_node); + priv->trough_node); } else { @@ -4316,7 +4316,7 @@ _gtk_range_set_steppers (GtkRange *range, priv->stepper_d_node = create_stepper_node (range, "up", NULL, - priv->has_stepper_c ? priv->stepper_c_node : priv->slider_node); + priv->has_stepper_c ? priv->stepper_c_node : priv->trough_node); } else { -- 2.30.2